Skip to content

merge 충돌 해결#129

Merged
mjy926 merged 19 commits into
developfrom
fix/conflict
Feb 27, 2026
Merged

merge 충돌 해결#129
mjy926 merged 19 commits into
developfrom
fix/conflict

Conversation

@mjy926

@mjy926 mjy926 commented Feb 25, 2026

Copy link
Copy Markdown
Contributor

No description provided.

minkyu97 and others added 19 commits August 3, 2023 23:57
prod 배포 : 채점, 포트폴리오 등 개선
prod 배포: 포트폴리오, 소스코드 제한, 지원자 수, 공지 개선
prod 배포: trailing-slash/update-portfolio-url
prod 배포: kotlin jvm target 변경 / base64 출력 지원
prod 배포: recruiting 종료 후 제출 막기
prod 배포: 리크루팅 결과 api 추가 / admin 리팩토링
프로그래머스 모집 기능 추가 (포트폴리오 v2 등)

---------

Co-authored-by: fivessun-ridi <fivessun@ridi.com>
Co-authored-by: fivessun-ridi <fivessun@ridi.com>
* 코드 채점 시 에러가 발생할 때 리트라이 로직 추가
* MySQL Connection 에러 대응하여 pool 설정 추가
- SSE 기본 ping 이벤트 간격 3600초로 변경
- CodeSubmissionResult 가 INTERNAL_SERVER_ERROR 일 때 CodeSubmission 를
Error로 판단
* 병합 충돌이 있어 수정해주었습니다.

---------

Co-authored-by: Minkyu Lee <whizkyu@snu.ac.kr>
Co-authored-by: Kyeongpyo Lee <70705786+deveroskp@users.noreply.github.com>
Co-authored-by: deveroskp <imsmile2004@naver.com>
@mjy926 mjy926 requested a review from a team as a code owner February 25, 2026 04:47
@coderabbitai

coderabbitai Bot commented Feb 25, 2026

Copy link
Copy Markdown
📝 Walkthrough

개요

Position 열거형(enum) 내부에 주석 한 줄이 추가되었습니다. # OPERATIONS = 8 주석이 추가되었으며, 실제 열거형 멤버나 제어 흐름에는 변경이 없습니다.

변경 사항

그룹 / 파일(들) 요약
열거형 주석 추가
wacruit/src/apps/common/enums.py
Position 열거형에 주석 한 줄 추가. 기능적 변화 없음.

코드 리뷰 소요 시간

🎯 1 (Trivial) | ⏱️ ~2분

추천 리뷰어

  • deveroskp
🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
Description check ❓ Inconclusive 설명이 제공되지 않았으므로 변경 사항과의 관련성을 확인할 수 없습니다. 병합 충돌 해결 내용과 변경 사항에 대한 설명을 추가하시기 바랍니다.
✅ Passed checks (2 passed)
Check name Status Explanation
Title check ✅ Passed 제목이 변경 사항과 관련이 있으며, 병합 충돌 해결이라는 명확한 의도를 전달합니다.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
  • 📝 Generate docstrings (stacked PR)
  • 📝 Generate docstrings (commit on current branch)
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch fix/conflict

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick comments (1)
wacruit/src/apps/common/enums.py (1)

89-91: 주석 처리된 정수 값이 활성 멤버의 문자열 타입과 불일치합니다.

Position 열거형의 활성 멤버는 모두 문자열 값("FRONTEND", "BACKEND" 등)을 사용하지만, 주석 처리된 항목들(# INFRA = 6, # PM = 7, # OPERATIONS = 8)은 정수 값을 사용합니다. 향후 이 값들이 주석 해제될 경우 혼합 타입 열거형이 생성되어 직렬화, 비교, 또는 DB 저장 시 예상치 못한 버그가 발생할 수 있습니다.

향후 활성화를 고려한다면 아래와 같이 일관된 문자열 값으로 미리 정정해 두는 것을 권장합니다.

♻️ 타입 일관성을 위한 수정 제안
-    # INFRA = 6
-    # PM = 7
-    # OPERATIONS = 8
+    # INFRA = "INFRA"
+    # PM = "PM"
+    # OPERATIONS = "OPERATIONS"
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@wacruit/src/apps/common/enums.py` around lines 89 - 91, The commented entries
in the Position enum (INFRA, PM, OPERATIONS) use integer literals which will
create mixed-type enum members if re-enabled; update those commented lines so
their values are strings consistent with the rest of the enum (e.g., "INFRA",
"PM", "OPERATIONS") to match existing members and avoid serialization/comparison
issues when reactivated. Locate the Position enum and replace or adjust the
commented lines for INFRA, PM, and OPERATIONS to use string values consistent
with other members.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Nitpick comments:
In `@wacruit/src/apps/common/enums.py`:
- Around line 89-91: The commented entries in the Position enum (INFRA, PM,
OPERATIONS) use integer literals which will create mixed-type enum members if
re-enabled; update those commented lines so their values are strings consistent
with the rest of the enum (e.g., "INFRA", "PM", "OPERATIONS") to match existing
members and avoid serialization/comparison issues when reactivated. Locate the
Position enum and replace or adjust the commented lines for INFRA, PM, and
OPERATIONS to use string values consistent with other members.

ℹ️ Review info

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 49095bf and 66f5ac3.

📒 Files selected for processing (1)
  • wacruit/src/apps/common/enums.py

@mjy926 mjy926 merged commit 83f9c61 into develop Feb 27, 2026
3 checks passed
@mjy926 mjy926 deleted the fix/conflict branch April 9, 2026 06:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants